Revision: bazaar--devel--1.1--patch-23
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Dec  7 06:34:34 EST 2004
Standard-date: 2004-12-06 19:34:34 GMT
New-files: tests/.arch-ids/test-tree-version.sh.id
    tests/test-tree-version.sh
Modified-files: commands/cmd-tree-version.c
    commands/cmdutils.c commands/cmdutils.h
    tests/Makefile.in
New-patches: rob.weir@canonical.com--2004-public/baz--bug3090--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-4
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-5
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-6
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-7
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-8
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-9
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-23
    thelove@canonical.com/bazaar--devo--1.1--patch-26
    thelove@canonical.com/bazaar--devo--1.1--patch-27
    thelove@canonical.com/bazaar--devo--1.1--patch-28
    thelove@canonical.com/bazaar--devo--1.1--patch-29
    thelove@canonical.com/bazaar--devo--1.1--patch-30
Summary: merge from rf
Keywords: 

Patches applied:

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.0--patch-65

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-1
   Read the tree-version from the dir specified by --dir.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-2
   Finish making tree-version set and get, and use -d.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-3
   Add tests for previous.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-4
   sync up with rocketfuel.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-5
   sync up with rocketfuel.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-6
   update copyright notices.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-7
   sync up with rocketfuel.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-8
   sync up with rocketfuel.

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-9
   sync up with THELOVE.

 * thelove@canonical.com/bazaar--devo--1.1--patch-26
   merge in aaron.bentley@utoronto.ca--baz/bazaar--three-way--0

 * thelove@canonical.com/bazaar--devo--1.1--patch-27
   make new-files header in import logs consistent with that in commit logs - bug #3589

 * thelove@canonical.com/bazaar--devo--1.1--patch-28
   merge in Tez Kamihira's gettext work, diff correctness & nuking of changes, and new command tree-id

 * thelove@canonical.com/bazaar--devo--1.1--patch-29
   revert lint UI change that regressed usability, and add po/README officially

 * thelove@canonical.com/bazaar--devo--1.1--patch-30
   Merge tree-version fixes.

